Revert "Fix org for eln new compilation folder layout"

This reverts commit f77f6ca77054ca6122df2742345710b7493ad293.

diff --git a/lisp/org/org.el b/lisp/org/org.el
index a9303e880b834305944338a6ec388e3f83e242f4..f1a7f61a9a1a6d500a5ba7d4ef5bf172c209b390 100644 (file)
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -78,10 +78,8 @@
 
 (or (eq this-command 'eval-buffer)
     (condition-case nil
-       (load (expand-file-name "org-loaddefs.el"
-         (if (string-match "[.]eln$" load-file-name)
-            (concat (file-name-directory load-file-name) "..")
-         (file-name-directory load-file-name)))
+       (load (concat (file-name-directory load-file-name)
+                     "org-loaddefs.el")
              nil t t t)
       (error
        (message "WARNING: No org-loaddefs.el file could be found from where org.el is loaded.")